Merge Errors

Fixed those annoying merge errors