Fixed bug causing multiple mistakes to be merged