Sorted out the merge conflict