rename overlapping columns on join, closes #530