Resolved conflict in code