counts a few more things
resolve conflict