Slightly dynamic ERB added
attempting to solve merge conflict?