Resolve merge conflicts

UltiSnips/all.snippets

@@ -2,8 +2,8 @@ snippet dd "Date and Time" i
 `date`
 endsnippet
 
-snippet cred "My private Credentials"
-Nicki Reiss <yannick.reiss@nickr.eu>
+snippet crednick "My private Credentials"
+Yannick Reiss <yannick.reiss@nickr.eu>
 endsnippet
 
 snippet credhsrm "Credentials HSRM"
@@ -45,3 +45,11 @@ ${9:Message}
 
 ${10:`cat ~/.signature.txt`}
 endsnippet
+
+snippet crednina "My true credentials"
+Nina Chloé Kassandra Reiß <nina.reiss@nickr.eu>
+endsnippet
+
+snippet pwd "Print the current working directory"
+`echo $(pwd)`
+endsnippet