Create new Eclipse project
Fixed merge confilcts