made a change
made other change
fix conflict
add public