organize after merge