add back the on ActivityResult method
merge conflict