Resolved issues with merge