catch up merges again