Now a working merge

Whats that about:
<<<<<<<<< head?!?!?!