solved conflicts