PLA-1192 resolved conflicts