resolved merge conflict
resolved merge conflict

adamhajari/spyre,flaviobarros/spyre,adamhajari/spyre,fmacias64/spyre,derekjanni/spyre,derekjanni/spyre,fmacias64/spyre,derekjanni/spyre,dolel13/spyre,flaviobarros/spyre,adamhajari/spyre,flaviobarros/spyre,dolel13/spyre,adamhajari/spyre,dolel13/spyre,fmacias64/spyre