remove print statement
resolve merge conflict