code aligned
conflict resolved