[aur-general] Please merge aafm and aafm-git