some changes for citations
fixed conflicts