Merge conflict resolved
Solved merge conflict