cleaning up merge mess