resolve conflict
remove superfluous output