Merge, everything clean. oskar, karl