merging was not complete, is now fixed