changed default conflict solving strategy