minor bugfix(<<<<<<< HEAD apearing in most of the .php filed)