adding fish divs
fixing merge conflict