hand solved conflicts