Fixed merging problemös