Added merge conflict and removed trailing whitespace