Remove intermediate texture again after merge conflict