Merging Fix V3