added additional code
fixed conflict