Finally a working merge u.u