DB設定を再度ignore
master merge