[artf995929] Fixed conflict regarding maven update.