A git repo to reproduce merge issue