Merged more conflicts; Still not working