Bugfixes
Fix merge conflict