Conflict #20, Conflict #13 Resolved

:+1:  :+1: