from dev 1
resolve the conflict