upating repository with final paper template
fixed merging issues