prepare branch for merge conflict example

cause an example merge conflict with this pull request