added displaying for conflicts on editor side