remove conflict file and fix faculty list showing the personal site and lab site's url