Resolve merge conflicts and remove IO.inspects