merging & stupid concat bugfix