Replace string
Fix conflicts