resolve merge conflicts
fix paren prob and ignore more in fringefiles