all code merged