Fixing Conflict Error

I don't know what this will do.