Removed a bracket too much while fixing merge conflicts