Attempt to fix issue with gradle's AT merging