Merge in simple branch