Fixed merge problems. Updated schedule to include ending meeting time