version 1.0 with no conflict updated code