Fixing merge gone wrong