Unit tests and Integration tests working from gradle via gretty
Conflicts solving