add vendor/elpa/archives
daily commit
pull and resolve conflict