solveTimeTabling front part done
Solve merge conflict