Generated Conflict on line 47

Tried to generate a conflict by changing logans comment.