adds conflict handling
bumps version