Added backtracking
Resolved a conflict