Create conflict
Fix conflicts