corrects minor errors
fix merge conflict