hr page
fix conflict