Fix conflict by editing datatrees