Merge branch 'conflict' into conflict_second

# Conflicts:
#	added-them-changed-us.txt
#	both-added.txt
#	both-deleted.txt
#	both-modded.txt
#	changed-them-added-us.txt
#	deleted-them.txt
#	deleted-us.txt
#
# It looks like you may be committing a merge.
# If this is not correct, please remove the file
#	/Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/discardFileChanges/actual/.git/MERGE_HEAD
# and try again.


# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
#
# On branch conflict_second
# All conflicts fixed but you are still merging.
#