Resolve merge problem part 2