fix merge conflicts; fix masonry