merge entry.jade changes