Repo that immediately has a merge conflict if merge 'feature' into 'master' - View it on GitHub