Add error checking to CI page
Resolve conflicts