Fixes merging of VersionOne defects.