Add rifle.conf to mergerc