commit -> push only
fixed conflict before merge
issue-2: new edit (push only)