Fixing merge conflicts...