fixed issues from pulling