fix index call
fix conflicts