front end functional
merge conflict