resolved auto merge in editor file