Added an emotional comment
Fixed conflicts