syntax
resolve several merge related errors