Corrected minor conflicts occured when merging.