Chris resolve conflict