I don't know what I'm doing yet.
configure
fix merge conflict