parent can edit child
merge conflicts child edit