Typos
Problems with merging