little things
fix conflict