pre-merge with tim
manual conflict resolution