pull master and fix