bug fixed in alignment model
conflict resolved