Fixed weird merge issue