Fix all build problems
fix conflicts