Fix conflict resolution mistakes