added comment to code
fixed conflict