merging

closes #8000