Fixed problems
fix conflicts