Merge code branch