Cleaning up merge files