Revert "fixing conflict natually"

This reverts commit acb963a3235ee6b6b9dfe320c8229c9b1904c0f6.