C6 L6
fixed conflict