Removed merge conflict from source.
Removed merge conflicts from source.