Found a few more merge errors

Fixed some more errors, we need to look into a better way to handle
merges.