resolving conflicts

resolve conflicts, add information, add needed templates, add our
custom css (needs to be added to settings file)