Fix conflict resolution error