Fixed Some Merge Issues