Fixing merge problems
Fixing conflicts