Add optional tools to go alongwith yaourt AUR usage
Manually merge conflicts