user root created new file while  user ubuntu was trying to fix conflicts during an attempt to merge his branch with master