remove merge conflict markers
fix wrong code