formatting and some conflict correctionss