Creating conflict file