My edits should be added now
Added my name in the conflict line
Made my name a part of the list