Fixed conflicts

Conflict