John proof reading done
john proof read and merge conflicts fixed