hi.
after merge - mine merges but alice's does not