Fixing conflicts 1
Fixing conflicts 2