merge the code