Template:ResolveConflict

I am going to edit on this page. Please do not edit while I'm here, as that will mess up my edit.