sorted out the merge conflict