Added concat function
Fixed merging conflicts