Reworked full merge