Add contact page
Conflict clip solved