Removed problematic merge leftovers