Attempt to merge again