resolved confilicts

resolved confilicts
removed style

removed style