stuff after merge