removing <<<<<HEAD from conflict merge