prior tp pull
merge files