Added my own print statement
Fixed conflicts