brace for incoming merge
merge commit