merged the two code bases