Removed conflicts in develop.css