Fix diff, conflict detection and merging of non-unique attributes