beginning of AA merge for different refs => needs re-write