Using amend by daniel
Using amend by daniel resolving conflict