Removed inline style from html
Fixed merge conflicts