Rollback gradle merge, needs redo