fixed pull errors