Conflict handelling done!