Sorting out merge issues: committing the latest versions of all files