Revert "fix merge conflict during pull"

This reverts commit e53895a7836e458ead328acd8a3ec6793b9ec710.