Fixed duff merge