PLA-1192 fixed confilict