fixing method calls
merge conflict