the idea being that you'd want to resolve any merg...
# sdf
d
the idea being that you'd want to resolve any merge conflicts