finish error handling, this way all conflicts are on one page