Conflict #1 Resolved

:+1: