Fixing merge errors