extended documentation about solving merge conflicts