restore barematel work after merge