sip tools
resolve conflicts gitignore