refactoring and comments
keyword
merge conflict