Took out some merge stuff