@EmmaStreet These mean that there has been a merge conflict that couldn't be auto resolved. When you see these you need to open up the file and manually work out what should be in the file.