tightned merge code