build gradle conflict resolved