From number chenaged
Conflicts resolved