Solved an error with crossing conflicts