Added doSomething function conflict resolved