added trade phase
this should fix the merges