Resolved conflict of merge