conflict stuff
Made changes