alignment fixing
merge resolution
merge resolution; alignment re-config