changed merge