after merging working