Finally fixed merging errors