index 3 conflict
merge solved