Fixes for merge-conflict