change template
resolve conflict