missing removed stuff while merging