Fixed conflicts
Missed conflict, resolved now