removed duplicate line
fixed conflict