fixed issue with merging ticket branches into demo