fixed association problem with source:deck
fix merge conflicts