Fixing merge thing