pull and push fix