Resolved failed merge