fix some merge errors