fixed weird merge thing