Whoops - missed a conflict like a boss