Now all the Maven problems introduced by the automerge have been fixed