merge code with another