improve merging and fix spelling mistakes