Fix small errors from conflict resolution