cleaning up merge