[aur-general] what is the best way to resolve conflicting files in aur packages?