merge, modify & debug