# Conflicts: # .env # index.html # src/assets/socialLinks.json # src/components/Message.vue # yarn.lock