Fixed stupid merge conflict that snuck in
Fixed stupid merge conflict that snuck in

Tallwave/ReusableBehaviors,swilliams/Lattice,Tallwave/Lattice,swilliams/Lattice,swilliams/Lattice,Tallwave/Lattice,Tallwave/ReusableBehaviors