added timeout and fixed merge request