Set up Insert page
fix conflicts