Syntax/lint checks / unit tests / integration tests
Fix merge conflict