Add comments to remember the merge function should be improved
Remove warnings with 4.01