some merge and css conflicts fixed