got rid of merge stuff