fixed conflicted merge