Fixed conflict in merge