conflicting feature

This is a pull request that will result in a conflict