Lines separated for an easy reading with github.
Merge conflict fixed.