the Eric configure theory
fix conflicts