Fix commit conflicts