Improved conflict resolution message

This is for issue #1187

The "conflict resolved" message currently take the form: 
```
Please note that,
    bootstrap#2.3.2 depend on jquery#>=1.8.0 <2.1.0 which resolved to 2.0.3

Resort to using jquery#2.1.0 which resolved to 2.1.0
```

This PR changes "depend" to "depends" and adds the package name after "resolved to" to clear up any confusion as to which package the version number refers to. For example: 
```
Please note that,
    bootstrap#2.3.2 depends on jquery#>=1.8.0 <2.1.0 which resolved to jquery#2.0.3

Resort to using jquery#2.1.0 which resolved to jquery#2.1.0
```