Fixed conflicts errors, better conflicts view in slices mode