Fix odd merge errors