Fixed some warnings from synthesizer
Fixed merges and scoring