merge changes once more