before third merge