Fix conflict
Add xml Design of ClaimForm