Fixed conflict issues, updated some of the template files.