Fixed weird merge