Took out messy merge stuff