took out line style in main.js
merged