Changes in the main logic
Merge conflict fix
Merge conflict fix