Remove conflicting code. Remove conflict errors as per changes of Javed.