Changed the first line
fixed conflict