do something
do another thing
fix the conflict from merge