removed some whitespace
fixed merge conflict