missed some of the merge errors