initial revision
fix conflicts