Fixing overwrite conflicts