Added string
Corrected conflicts