Fixing weird merge thing