reset unmerged error
ADD: Gidravlic