Fixing Faulted merge