arquilian flaid config
merge conflict fixed arquillian config