Atomic Bomb Commit
Fixed Conflict