Fix indent
Fixed conflicts