Fixed Mege Conflict