Fixed weird merge thing