Removed confict diff.