merging
Resolve conflicts
Styled challenge form