on-merge - passing