push after merge