remove example
resolve merge conflict