Fixed evaluation of method calls to void methods
fixed merge conflict