fixed more whitespace merge errors