Back merging master