Fixed merging errors of last commit