Create a conflict in Github