fixed: some merging issues.