cleaning up merge leftovers