BUG: Fixing some merge errors