Commit before sports

Back to complete the “mergePathStates”