repair merge - incorrect variables