merge with master going to bed