Cleaning up merge files and issues