fixing bug with directory save
resolve conflict