Fix paragraph seperation
Fix merge conflict

Conflicts:
	doc/thesis/mainmatter/simulation_model_kf.tex