removed merging artifacts
corrected a merge error