minor corrections to fix file conflicts