small changes
resolve conflict