layer can be removed
merge conflict