Fix small merge errors