merge with timelne plugin