test-auto-merge stages changes conflict changes master changes staging lambda update staging pie day! pie day 2!