Fix commit merge