correctly mmerged files; always run the tests before merging