changed gutter to suit tiles
fix conflicts