Add missing elements left out in torch tile commit and remove conflict flags