commit for merge
fixed merging problems