fixed past/present
Merge