fixes for some merge errors