Fixed the error page
Removed duplication (merge error)
Identation