Use inclusive query for "keep this code unchanged" interface.
Show the chunk with unresolved conflict regardless of the preference settings.
Bumped the version number to v0.6.5
Merge branch 'release/v0.6.5' into develop