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 4589efc
# Last command done (1 command done):
#    pick 9013b5f myfile4 conflict
# Next commands to do (3 remaining commands):
#    pick 0fa5386 5
#    drop 69a5c9f 6
# You are currently rebasing branch 'master' on '4589efc'.
#
# Changes to be committed:
#	modified:   myfile4
#