font end connected
merge api
add delete files
merge conflict