adding .project and Resources/*
adding .settings
fix conflict
really fix conflicts