solved issue due to merging