Resolving maven build conflicts