fixed bad conflict merge