First working merge