Kate- attempting to resolve merge conflict