Repo that immediately has a merge conflict if merge 'feature' into 'master'
No issues in this repository yet.