Resolved merge conflict

:)