34_task - fix fatall error afeter unsuccessfull merge