resolve conflict :/