updated merge settings
added resharper settings
set module path correctly
added git aliases