beat the coords
everything working
fixed merge