fixing merge data