tests ok
delete conflict
merge