merged conflict personal note