jad and his bootstrap
merge conflict fix