Edit conflict file