Checked in by Bo
solve conflicts