ok fixed, and merging