merged diff in code