Worked on the methodology
Fixed merge conflict
?
Fixed merge conflict