Reduced 7ewan to resources
fixed merge