Fixing merge