Solved conflict isaac