refactor
fixing merge conflict