removed this conflict stuff.
Revert "removed this conflict stuff."

This reverts commit 63d816c22b32c8328bc22a19884586fe53edf077.