Generation of openinghours now solves conflicts

Signed-off-by: Stanislav Láznička <slaz@seznam.cz>