bug_fix: fixing merge conflicts