Boom, are we going to hav a merge conflict?