fixed masonry
fixed conflicts