minimal changes
got rid of extra merge characters