0512 merging