fixed merging shit