resolve the conflict of gitignore commit.