fixed a failed merge
still fixing a failed merge
fixed a typo