Removed spaces introduced by merge problems
Remove blank lines introduced through merge process