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

...icts