remove agnoster
merge conflict