create small-conflict and edit awesome_page with new line