Wrong merge fixed