conflict merge data error corrected