Bugfix: fix conflits