fixed conflicted