resolved confilicts

resolved confilicts
removed style

removed style
Conflict resolved

Conflict resolved