fixed off the side foks
mergin