bugfix: remove conflict comment