git remote add aur https://aur.archlinux.org/aseprite.git git fetch aur git merge -X theirs --no-edit aur/master