[fix] [minor] changed validation message
[fix] [minor] fixes in item merging
Merge branch 'master' of github.com:webnotes/erpnext