fix and merge