Fixed conflicts after merge with new Brackets version