syntax cleanup
conflict fix