merge fix and something...