Form Template
Events Calendar
Events Calendar
conflicts in merge