Merge changes fixed.