got rid of merge leftovers