resolving conflicts and merging issue-24