final version 1.0

resolved some weird conflict