edit first_file on side_branch
commit after resolving conflicts in first_file