workingHours and book room
working hours
merge error fixed