Merge Linguist fix