Relocate normalisation algorithm
Conflict resolve