refs #6856 small merging error fixed