updated selected papers list
resolved conflicts