adds new file
will create merge conflict 1
will create mergeconflict 2