unsolved merge