Fixed merging issue;