fixed rebase #31

Closed devinshade closed 8 months ago