Ok I fix this and I merge