faculty time table by shraddha
fix conflict