create conflict
fix conflict