Study records
fix conflicts