Reflect: merging 2 branches