Fixed "merge conflict"
Fixed "merge conflict"

YaneYosifov/JS-UI-and-DOM-Teamwork-Project,shunobaka/JS-UI-and-DOM-Teamwork-Project,YaneYosifov/JS-UI-and-DOM-Teamwork-Project,shunobaka/JS-UI-and-DOM-Teamwork-Project