Resolved merging issue.