experimenting with eta correction
fix conflicts in merge