resolve errors from merge conflicts