# Conflicts: # package.json
Feature/newfeature See merge request !1756
Feature/home optimization See merge request !1758
