Finished yesterday's merge