oauth initally installed
conflicts resolved