Fixes git problem while merging