added java projects
fixed conflict