Reorganise after merge