fixing mistakes between branches