first comfict
solve merge