ficing some merge errors