bomb timer
conflicts resolved