Fixing Merge Hopefuly