boxes aligned
fixed merge conflicts