merge 2 other dev
resolved fetch and merge