added a test and made a correction to my gutter calculations
resolved conflict