Another resolve after merge