initialize
fix conflicts