Fixed Merge Failing