Add file to track upstream merges