[aur-general] Merges