Fixed bad brackets
Fixed conflict