updated project tree
fixed conflict