Resolved conflict from merge