Fixed conflicted