changes
fix conflict
some changes after solving conflict