merge conman's change