Finally fixed merging fiasco.