remember the cite
fix conflicts