Fixed small merging errors