minor improvement to conflicts command and updated doc about merge conflicts
Merge pull request #323 from volaya/conflicts

minor improvement to conflicts command and updated doc about merge confl...