created shared dir
fixed merge