Fixed conflicts

Fixed conflicts