minor tweaks for increased readability
reverting conj -> concat
resolving conflict