sort of fixed merge by deleting old file and resaving it