add lines to file
Pull is not possible because you have unmerged files.