for testing how to resolve binary conflicts