updated version 1.0
confict resolution