1. fixed header in fail page
1. merge conflict