fixed javascript from reloading
fixed welcome index
added merchants to welcome index
fixing conflict