Fauxton did not require a merge