slackoverflow on its way
psr fix
merge fix