changed line limit
fixed conflict