need to commit minior changes for merge
fixed merge errors