deletion and refactoring
merge conflict