probably missing a curly brace in this file
Fixing merge issues