updated project directory
fixed conflict