refactoring extra variable not required
fix merge conflict