Deleted old project
rsolved conflict
fixed conflict