diff --git a/sachbeihilfe/dfg_sachbeihilfe.tex b/sachbeihilfe/dfg_sachbeihilfe.tex
index e4f3e8c..dfbc997 100644
--- a/sachbeihilfe/dfg_sachbeihilfe.tex
+++ b/sachbeihilfe/dfg_sachbeihilfe.tex
@@ -1,132 +1,11 @@
 \documentclass[11pt,a4paper]{article}
-<<<<<<<< HEAD:sachbeihilfe/dfg_sachbeihilfe.tex
 \input{dfgheader}
-========
-
-%%%%% packages %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\usepackage[english]{babel}
-\usepackage{graphicx}
-\usepackage[right]{eurosym}
-\usepackage{pgfgantt}
-\usepackage{SIunits}
-\usepackage{enumitem}
-
-%%%%% colors %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\usepackage{xcolor}
-\definecolor{dfgblue}{cmyk}{1,0.7,0,0}
-
-%%%%% hyperref %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\usepackage[breaklinks=true,colorlinks=true,citecolor=dfgblue,urlcolor=dfgblue,linkcolor=dfgblue]{hyperref}
-\newcommand{\email}[1]{\href{mailto:#1}{#1}}
-
-%%%%% page layout %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\usepackage[left=25mm, right=25mm, top=25mm, bottom=25mm]{geometry}
-\usepackage{lastpage}
-\usepackage{fancyhdr}
-\pagestyle{fancy}
-\fancyhf{}
-\fancyhead[RO, LE]{\footnotesize{page \thepage\ of \pageref{LastPage}}}
-\fancyhead[LO, RE]{\footnotesize{DFG form 53.01 – 09/22}}
-\fancyfoot[LO, RE]{\begin{minipage}[c]{0.7\textwidth}
-    \footnotesize{\textcolor{dfgblue}{Deutsche Forschungsgemeinschaft}\\
-    Kennedyallee 40 $\cdot$ 53175 Bonn $\cdot$ postal address: 53170 Bonn\\
-    phone: + 49 228 885-1 $\cdot$ fax: + 49 228 885-2777 $\cdot$ \email{postmaster@dfg.de} $\cdot$ \url{www.dfg.de}}
-  \end{minipage}
-  \begin{minipage}[c]{0.29\textwidth}
-    \hfill{}
-    \includegraphics[width=0.7\textwidth]{DFG_logo.png}
-  \end{minipage}
-}
-
-\renewcommand{\headrulewidth}{0pt}
-
-%%%%% "Arial" font %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\renewcommand{\familydefault}{\sfdefault}
-\usepackage{helvet}
-
-%%%%% sectioning %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\usepackage{titlesec}
-\setcounter{secnumdepth}{2}
-\titleformat{\paragraph}
-{\normalfont\normalsize\bfseries\itshape}{\theparagraph}{1em}{}
-\titlespacing*{\paragraph}
-{0pt}{1ex plus 3ex minus .2ex}{0.5ex plus .2ex}
-
-%%%%% bibliography %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\usepackage[natbib=true, backend=bibtex, sorting=nyt, style=authoryear, dashed=false, firstinits=true, maxcitenames=2, maxbibnames=20, url=false, doi=false]{biblatex}
-\DeclareNameAlias{sortname}{last-first}
-\DeclareFieldFormat[article,inbook]{title}{#1}
-\renewbibmacro{in:}{\ifentrytype{article}{}{\printtext{\bibstring{in}\intitlepunct}}}
-\newcommand{\bibemph}[1]{#1}
-
-\DeclareBibliographyCategory{ownpubs}
-\DeclareBibliographyCategory{otherpubs}
-
-\AtEveryBibitem{\ifcategory{ownpubs}{}{\clearfield{title}}}
-
-\newcommand{\addownpubs}[1]{\addtocategory{ownpubs}{#1}\nocite{#1}}
-\newcommand{\addotherpubs}[1]{\addtocategory{otherpubs}{#1}\nocite{#1}}
-
-\bibliography{publications,references,ALL_19_03_03}
-
-%%%%% figures %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-% captions:
-\usepackage{sidecap}
-\usepackage[format=plain,singlelinecheck=off,labelfont=bf,font={footnotesize,sf}]{caption}
-
-% references to panels of a figure within the caption:
-\newcommand{\figitem}[1]{\textsf{\bfseries\lowercase{(#1)}}}
-% references to panels of a figure within the text:
-\newcommand{\panel}[1]{(\textsf{#1})}
-% references to figures:
-\newcommand{\fref}[1]{\textup{\ref{#1}}}
-\newcommand{\subfref}[2]{\textup{\ref{#1}}\,\panel{#2}}
-% references to figures in normal text:
-\newcommand{\fig}{fig.}
-\newcommand{\Fig}{figure}
-\newcommand{\figs}{figs.}
-\newcommand{\Figs}{figures}
-\newcommand{\figref}[1]{\fig~\fref{#1}}
-\newcommand{\Figref}[1]{\Fig~\fref{#1}}
-\newcommand{\figsref}[1]{\figs~\fref{#1}}
-\newcommand{\Figsref}[1]{\Figs~\fref{#1}}
-\newcommand{\subfigref}[2]{\fig~\subfref{#1}{#2}}
-\newcommand{\Subfigref}[2]{\Fig~\subfref{#1}{#2}}
-\newcommand{\subfigsref}[2]{\figs~\subfref{#1}{#2}}
-\newcommand{\Subfigsref}[2]{\Figs~\subfref{#1}{#2}}
-% references to figures within brackets:
-\newcommand{\panelb}[1]{\textsf{#1}}
-\newcommand{\subfrefb}[2]{\textup{\ref{#1}}\,\panelb{#2}}
-\newcommand{\figb}{fig.}
-\newcommand{\figsb}{figs.}
-\newcommand{\figrefb}[1]{\figb~\fref{#1}}
-\newcommand{\figsrefb}[1]{\figsb~\fref{#1}}
-\newcommand{\subfigrefb}[2]{\figb~\subfrefb{#1}{#2}}
-\newcommand{\subfigsrefb}[2]{\figsb~\subfrefb{#1}{#2}}
->>>>>>>> a87cf28aa858aece6d10d228648689e45c91a809:Beschreibung_des_Vorhabens.tex
 
 %%%%% notes %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \usepackage{ifthen}
 \newcommand{\note}[2][]{{\textcolor{blue}{\itshape[\ifthenelse{\equal{#1}{}}{}{#1: }#2]}}}
 \newcommand{\notejb}[1]{\note[JB]{#1}}
 \newcommand{\notejg}[1]{\note[JG]{#1}}
-<<<<<<<< HEAD:sachbeihilfe/dfg_sachbeihilfe.tex
-\newcommand{\notebl}[1]{\note[BL]{\color{purple}#1}}
-\newcommand{\red}[1]{\textcolor{red}{#1}}
-\newcommand{\add}[1]{\textcolor{blue}{#1}}
-
-%%%%% math %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\usepackage{amsmath}
-\newcommand{\e}[1]{eq.~(\ref{eq:#1})}
-\newcommand{\link}[1]{\ref{eq:#1}}
-\newcommand{\half}{\frac{1}{2}}
-\renewcommand{\refname}{\vspace*{-3em}}
-\newcommand{\be}{\begin{equation}} \newcommand{\ee}{\end{equation}}
-\newcommand{\ba}{\begin{eqnarray}} \newcommand{\ea}{\end{eqnarray}}
-\newcommand{\lr}[1]{\left\langle #1 \right\rangle}
-========
->>>>>>>> a87cf28aa858aece6d10d228648689e45c91a809:Beschreibung_des_Vorhabens.tex
 
 %%%%% colors %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \usepackage{color}
@@ -137,7 +16,6 @@
 \newcommand{\ora}[1]{{\color{orange} #1}}
 \newcommand{\blau}[1]{{\color{blue} #1}}
 
-
 %%%%% hyphenation %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \hyphenation{}
 
@@ -155,13 +33,8 @@
 \subsection*{Project Description --- Project Proposals}
 \noindent
 \begin{tabular}{@{}llll}
-<<<<<<<< HEAD:sachbeihilfe/dfg_sachbeihilfe.tex
   \textbf{\large Applicant 1} & City & Title & permanent position \\[0.5ex]
   \textbf{\large Applicant 2} & City & Title & permanent position
-========
-  \textbf{\large Jan Benda} & T\"ubingen & Prof. Dr. & permanent position \\[0.5ex]
-  \textbf{\large Jan Grewe} & T\"ubingen & Dr. & permanent position \\[0.5ex]
->>>>>>>> a87cf28aa858aece6d10d228648689e45c91a809:Beschreibung_des_Vorhabens.tex
 \end{tabular}
 
 \section*{Project title}
diff --git a/sachbeihilfe/dfgheader.tex b/sachbeihilfe/dfgheader.tex
index 3321dc7..e27c957 100644
--- a/sachbeihilfe/dfgheader.tex
+++ b/sachbeihilfe/dfgheader.tex
@@ -33,7 +33,7 @@
   \begin{minipage}[c]{0.24\columnwidth}
   \includegraphics[width=\textwidth]{DFG_logo.png}
   \end{minipage}
-  }  
+  }
   \renewcommand{\headrulewidth}{0pt}
 }