Solve Conflicts During Github Commit Push On Uipath Studio