Merge conflict bug fix