(refactor) removed merge conflicts