header stuff done
fixed conflict