adds fish syntax to vim and postgres
fixing merge conflict
ignoring