Solved problem after merging