(bug) fixed files from previous git merge conflicts