Cleaning up merge