Merging related error

Jira Issue: WP-778