fixed my stupid conflicts and commented out someth