remove trailing whitespace
resolve conflict