Drop org.apache.maven.surefire dependency

This is not really needed but leads to random error
java.lang.ArrayIndexOutOfBoundsException: Array index out of range: 0
Added option to never use merge commit