Updated to the great merge package