You can delete file that have conflict. In my commit this file is deleted.
Try:
git rm vexil/lib/referee.ex
and push changes in your shell and then try submit PR.
You can delete file that have conflict. In my commit this file is deleted.
Try:
git rm vexil/lib/referee.ex
and push changes in your shell and then try submit PR.