Recovered from mess in the Maven project caused by automatic merge
HELP
S*it
Merge branch 'damnation'
Trying to recover