merged at 7pm