remove mergin-stuff..