Adding Heuristics to Conflict-Based Search for Multi-Agent Pathfinding