merge for the third time