Remove two blank lines
Resolve conflict