Merge was resolved the wrong way, files that should have been deleted were reinstated