removed some merge errors