Fixing merge conflicts
#% merge conflicts