commit from dev2
resolve the conflict with dev3