merge
adds main.jade