fix up whitespace
merge base, resolve conflicts