Git Edit Merge Commit