Edited bubbleUp
Edited bubbleUp and fixed merge conflict