conflict resolved
deals view changed
 deal css changed
conflict resolved
conflict resolved
added searchbar box back