Merge todays work