simplify merges and cs
whitespace
Merge pull request #3234 from dereuromark/3.0-cs

simplify merges and cs