Fix Conflicts And Run Github