refactored code
merge conflict