online changes
resolve conflict