Reorder the gradle file correctly

This is why you always test after resolving conflicts