got rid of 2 just conflict now