Fixing some merge errors