Fixed conflict resolution error