fixed commit conflict text in code
fixed deprecated method calls