Feature: Linting of code of previous commit
Feature: Fixed Merge Conflicts while merging from Master to Feature branch