move from gradle to maven with afp 36 and resolve merge conflict
This will create a new commit in order to revert the existing changes.
