some small corrections after merge conflict, resolved in previous commit