Ignoring files auto generated on merge conflict.
Updated version of JUnit to the latest(non-stable)

Ran mvn versions:display-dependency-updates
Might as well be on the bleeding edge.