fixing weird merge issue