Add Pull out Fire feature
Merge conflict