fixed mapping
fix conflict