re #44 corrected a typo in the SQL request to get the information about a conflict
renamed a variable to make it clearer
close #44 now we redirect to a conflict page when a user has saved an article that has been edited while he was editing, it's not perfect, but at least it should permit to find a way to resolve the conflict