fix small merge errors