Fixed conflicts
'