committing to pull
fixed merge conflicts
fixed merged conflicts