Should create a conflict with the origin on github
This may fix the conflict locally