fixed merge consflicts in Entwurf added *.orig file generated by meld