myfile4 conflict

# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
#
# interactive rebase in progress; onto ea4a99e
# Last command done (1 command done):
#    pick efbb36c myfile4 conflict
# Next commands to do (3 remaining commands):
#    pick 9147ce4 5
#    pick e2251a5 6
# You are currently rebasing branch 'master' on 'ea4a99e'.
#
# Changes to be committed:
#	modified:   myfile4
#
