Refactor Code
Resolved conflict