local changes push
change remote from local by merging