added printf
added return 0
added closing curly bracket
fixed merge conflicts