clearing for merge
fixed merge