Daniel has modified the file while I had changes too. Daniel committed and pushed. When I Pulled it aborted.
Found out you can add new lines to the working file which will allow you to use content from both conflicting files - merging them into the working file.