Fixing merge bugs