fixes #4088,#4155 - when after conflict resolving the primitive has equal semantic attributes as theirs, the primitive will get the same modified flag as theirs.