merge original code