Revisit reset after push conflict
Unignore basic arquillian tests