Minor fix in ProcessStep and Merge mistake