prefer our path over the default
merge