Fixing last merge conflict