resolve merge conflict of develop -> remove_reflection

1 job for remove_reflection in 48 seconds (queued for 2 seconds)