start document aimed at ONeil
resolve conflict