Commit in order to pull changes.
Merge conflict resolved.
Avoiding merge conflict...