resolved merge

Signed-off-by: Arthur Gibbs <ArthurGibbs@gmail.com>