Fix

resolves merge conflict

adds twig service injection

Adding all files to git via Yireo Command

minor fixes

Adding all files to git via Yireo Command