fixed merge + overloaded buildAndWatch