Resolve merge conflict from bug fix