merge conflict fixes.
merge conflict fixes.

Southpaw-TACTIC/TACTIC,diegocortassa/TACTIC,Southpaw-TACTIC/TACTIC,diegocortassa/TACTIC,diegocortassa/TACTIC,diegocortassa/TACTIC,Southpaw-TACTIC/TACTIC,Southpaw-TACTIC/TACTIC,diegocortassa/TACTIC,Southpaw-TACTIC/TACTIC,diegocortassa/TACTIC,Southpaw-TACTIC/TACTIC