concept fleshing
merge conflict
delete