done with my version 2.0
resolved merging conflict