clipper integration
merge conflict