Fixed Conflict

Yes, I fixed Conflict