Added a fix for multiple level conflict resolution