Conflict resolved!