changed some whitespace
merged conflicts.