resolved #44
resolve conflict