Revert changes done to test how to solve git conflict