some small changes
fix conflict