Fix syntax and style errors and errors after deficient merge conflic
resolving after branch merging.