removed merge conflict markers
removed trailing whitespaces, whitespace only change