a jeter
fix conflicts