Fix for Merge Conflict

After this good to merge in ;D!