fixing gradle merge