bibliography fixed
merge + fix conflicts