fixed errors made during last merge and resolving cinflicts