modify at home
resolve conflict