..F....... [ZBX-7399] resolved conflicts