Fixed some merging errors