The conflict resolves when Russia returns to it's borders pre-2014, and stops attacking, it's that simple.