Adding a conflict in github editor....