Fixed Merge XD