Fix Conflicts And Run Git Commit