getting basic dracula trails working
fixing merge conflict