Another unresolved merging conflict craziness.