A shunting yard is used to store trains between arrival and departure. A conflict arises in a shunting yard when one train obstructs another from leaving. Resolving a conflict is done by re-allocating the trains obstructing the departing train to other tracks in the shunting yard. However, these re-allocations complicate the problem at hand and incur high costs for train operators. Therefore, it is desirable to avoid conflicts whenever possible. The aim of this paper is to find an effective manner to deal with conflicts in a train shunting yard in an existing planner system. We propose the split into a portfolio planner, which first tries to find a solution without any re-allocations, and if that does not yield a solution will look for a solution with re-allocations. For both planners, a model is defined. Furthermore, the paper explores techniques to increase the speed of the first planner, namely heuristic search, a set partitioning approach, and constraint programming. An implementation of the latter approach has exhibited excellent performance across problems of all sizes.