merge fix & pulling all traildata now