creating a conflict from github