third merge test, with fork