All merge problems are resolved now!