removed merge-stuff