Conflict #1, Conflict #17 Resolved

:+1: