Merge again!