fixing some merge errors