More problems after merge