bundle update
fix merge error (complements 7c778581030a93b9b988c2bb92fa6302319565d1)