wiretap corrections
git db conflicts