added conflict merge