Timeline GET
fix merge