added note on merge