merge test branch
Fixed the conflicts on branches