To be honest: I'm not sure I really got the conflicts handling completely. That's by far the hardest part for me to understand. What would be a generic solution that should work reliable for a simple conflict resolution?

P.S.: sorry I seem to have broken your comments by pushing the merge too soon. I thought it's OK to update my branch?