Merge lucas edt